Auto merge of #1317 - alexcrichton:issue-1297, r=huonw
authorbors <bors@rust-lang.org>
Tue, 17 Feb 2015 05:00:30 +0000 (05:00 +0000)
committerbors <bors@rust-lang.org>
Tue, 17 Feb 2015 05:00:30 +0000 (05:00 +0000)
commite8f68ccf3bf190bee1bab2162ef633833bb154de
tree9fc226358df7a59363fdd9ba54febf73dd09bd74
parente7393a026946b62ad3194f5f5d91542e6bd3ae49
parent02e7dc8e378ce656f09b58abcaea5691683e29ef
Auto merge of #1317 - alexcrichton:issue-1297, r=huonw

Not sure why we were doing this, it's quite useful!

Closes #1297